From: Ignacy Kuchciński <ignacykuchcinski@gnome.org>
Date: Fri, 12 Sep 2025 11:19:51 +0000 (+0200)
Subject: ci: Fix building toolbox with latest malcontent
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~95^2^2~4
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=851cb6a201b7d06c95c8d31a70f786fda44b1de7;p=gnome-shell.git

ci: Fix building toolbox with latest malcontent

While introducing latest malcontent in the toolbox, mistakenly wrong
path to install-meson-project.sh was used. Correct this by using the
proper path, after copying the script there.

Moreover, disable building documentation in malcontent subproject
libgsystemservice, so that we don't have to install more dependencies.

Fixes: b7992b80 ("ci: Include latest malcontent in the toolbox")
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3873>
---

diff --git a/.gitlab-ci/build-toolbox-image.sh b/.gitlab-ci/build-toolbox-image.sh
index 7bc13a96a..a4cb6e228 100755
--- a/.gitlab-ci/build-toolbox-image.sh
+++ b/.gitlab-ci/build-toolbox-image.sh
@@ -41,13 +41,11 @@ build_container() {
   )
   buildah run $build_cntr dnf config-manager setopt '*-openh264.enabled=0'
   buildah run $build_cntr dnf install -y "${extra_packages[@]}"
+  buildah run $build_cntr dnf builddep malcontent -y # for building libmalcontent
   buildah run $build_cntr dnf debuginfo-install -y "${debug_packages[@]}"
   buildah run $build_cntr dnf clean all
   buildah run $build_cntr rm -rf /var/lib/cache/dnf
 
-  # add latest malcontent to the toolbox image for testing future integration
-  buildah run $build_cntr .gitlab-ci/install-meson-project.sh https://gitlab.freedesktop.org/pwithnall/malcontent.git main
-
   # somehow the sysusers trigger from the flatpak package messes up the
   # permissions of /etc/passwd to be only readable by root
   buildah run $build_cntr chmod 644 /etc/passwd
@@ -61,6 +59,9 @@ build_container() {
   local srcdir=$(realpath $(dirname $0))
   buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec
 
+  # add latest malcontent to the toolbox image for testing future integration
+  buildah run $build_cntr /usr/libexec/install-meson-project.sh https://gitlab.freedesktop.org/pwithnall/malcontent.git main -Dlibgsystemservice:gtk_doc=false
+
   # include convenience script for updating mutter dependency
   local update_mutter=$(mktemp)
   cat > $update_mutter <<-EOF